Autogenerated HTML docs for v1.8.1.3-535-ga923c
diff --git a/git-config.html b/git-config.html index e253b78..4c35436 100644 --- a/git-config.html +++ b/git-config.html
@@ -3143,13 +3143,104 @@ </dt> <dd> <p> - The diff tool to be used by <a href="git-difftool.html">git-difftool(1)</a>. This - option overrides <code>merge.tool</code>, and has the same valid built-in - values as <code>merge.tool</code> minus "tortoisemerge" and plus - "kompare". Any other value is treated as a custom diff tool, - and there must be a corresponding <code>difftool.<tool>.cmd</code> - option. + Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>. + This variable overrides the value configured in <code>merge.tool</code>. + The list below shows the valid built-in values. + Any other value is treated as a custom diff tool and requires + that a corresponding difftool.<tool>.cmd variable is defined. </p> +<div class="ulist"><ul> +<li> +<p> +araxis +</p> +</li> +<li> +<p> +bc3 +</p> +</li> +<li> +<p> +codecompare +</p> +</li> +<li> +<p> +deltawalker +</p> +</li> +<li> +<p> +diffuse +</p> +</li> +<li> +<p> +ecmerge +</p> +</li> +<li> +<p> +emerge +</p> +</li> +<li> +<p> +gvimdiff +</p> +</li> +<li> +<p> +gvimdiff2 +</p> +</li> +<li> +<p> +kdiff3 +</p> +</li> +<li> +<p> +kompare +</p> +</li> +<li> +<p> +meld +</p> +</li> +<li> +<p> +opendiff +</p> +</li> +<li> +<p> +p4merge +</p> +</li> +<li> +<p> +tkdiff +</p> +</li> +<li> +<p> +vimdiff +</p> +</li> +<li> +<p> +vimdiff2 +</p> +</li> +<li> +<p> +xxdiff +</p> +</li> +</ul></div> </dd> <dt class="hdlist1"> difftool.<tool>.path @@ -4378,13 +4469,103 @@ </dt> <dd> <p> - Controls which merge resolution program is used by - <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "araxis", - "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", - "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" - and "xxdiff". Any other value is treated is custom merge tool - and there must be a corresponding mergetool.<tool>.cmd option. + Controls which merge tool is used by <a href="git-mergetool.html">git-mergetool(1)</a>. + The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires + that a corresponding mergetool.<tool>.cmd variable is defined. </p> +<div class="ulist"><ul> +<li> +<p> +araxis +</p> +</li> +<li> +<p> +bc3 +</p> +</li> +<li> +<p> +codecompare +</p> +</li> +<li> +<p> +deltawalker +</p> +</li> +<li> +<p> +diffuse +</p> +</li> +<li> +<p> +ecmerge +</p> +</li> +<li> +<p> +emerge +</p> +</li> +<li> +<p> +gvimdiff +</p> +</li> +<li> +<p> +gvimdiff2 +</p> +</li> +<li> +<p> +kdiff3 +</p> +</li> +<li> +<p> +meld +</p> +</li> +<li> +<p> +opendiff +</p> +</li> +<li> +<p> +p4merge +</p> +</li> +<li> +<p> +tkdiff +</p> +</li> +<li> +<p> +tortoisemerge +</p> +</li> +<li> +<p> +vimdiff +</p> +</li> +<li> +<p> +vimdiff2 +</p> +</li> +<li> +<p> +xxdiff +</p> +</li> +</ul></div> </dd> <dt class="hdlist1"> merge.verbosity
